This repository has been archived by the owner on Mar 27, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 9
Spg update #574
Open
c-mita
wants to merge
11
commits into
master
Choose a base branch
from
spg_update
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Spg update #574
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This pull request is only here to trigger the travis-ci build. Please do not merge this branch or use it as the base for any other commits - expect frequent rebasing. |
gerring
reviewed
Feb 24, 2017
return new Point(m.group(4), Integer.parseInt(m.group(5)), Double.parseDouble(m.group(6)), | ||
m.group(1), Integer.parseInt(m.group(2)), Double.parseDouble(m.group(3))); | ||
} | ||
throw new RuntimeException("Unparsable string" + asString); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
gerring
reviewed
Feb 24, 2017
@@ -133,4 +135,21 @@ public int getIndex(String name) { | |||
} | |||
return indices; | |||
} | |||
|
|||
private static final String VERTEX = "([a-zA-Z0-9_])+\\((\\d+)\\)=([-+]?[0-9]*\\.?[0-9]+)"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
gerring
reviewed
Feb 24, 2017
@@ -133,4 +135,21 @@ public int getIndex(String name) { | |||
} | |||
return indices; | |||
} | |||
|
|||
private static final String VERTEX = "([a-zA-Z0-9_])+\\((\\d+)\\)=([-+]?[0-9]*\\.?[0-9]+)"; | |||
private static final Pattern POSITION = Pattern.compile(VERTEX + ", " + VERTEX); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Generators now need to be accessed through compound generator. CompoundGenerator needs to have its prepare method called. generator.num has been renamed to generator.size Comment out/pass over ArrayGenerator code for the moment, as it is not available in scanpointgenerator right now (it will be restored soon).
generator.names has been renamed to generator.axes generator.num has been renamed to generator.size Units given to generators now need to be an array matching the length of the given axes array. The random offset algorithm has changed, and value comparisons need to be updated.
Please put your changes on the 'regions' branch as instructed. The Java changes there are required. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updates scan point generator to a more recent work-in-progress version and
makes any changes required as a result of minor interface changes.